-
Notifications
You must be signed in to change notification settings - Fork 800
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Instant Search: Include a8c-support-theme kb_article taxonomies #38660
base: trunk
Are you sure you want to change the base?
Conversation
Are you an Automattician? Please test your changes on all WordPress.com environments to help mitigate accidental explosions.
Interested in more tips and information?
|
Thank you for your PR! When contributing to Jetpack, we have a few suggestions that can help us test and review your patch:
This comment will be updated as you work on your PR and make changes. If you think that some of those checks are not needed for your PR, please explain why you think so. Thanks for cooperation 🤖 The e2e test report can be found here. Please note that it can take a few minutes after the e2e tests checks are complete for the report to be available. Follow this PR Review Process:
Still unsure? Reach out in #jetpack-developers for guidance! Jetpack plugin: The Jetpack plugin has different release cadences depending on the platform:
If you have any questions about the release process, please ask in the #jetpack-releases channel on Slack. Backup plugin:
If you have any questions about the release process, please ask in the #jetpack-releases channel on Slack. Boost plugin:
If you have any questions about the release process, please ask in the #jetpack-releases channel on Slack. Search plugin:
If you have any questions about the release process, please ask in the #jetpack-releases channel on Slack. Social plugin:
If you have any questions about the release process, please ask in the #jetpack-releases channel on Slack. Starter Plugin plugin:
If you have any questions about the release process, please ask in the #jetpack-releases channel on Slack. Protect plugin:
If you have any questions about the release process, please ask in the #jetpack-releases channel on Slack. Videopress plugin:
If you have any questions about the release process, please ask in the #jetpack-releases channel on Slack. Migration plugin:
If you have any questions about the release process, please ask in the #jetpack-releases channel on Slack. Mu Wpcom plugin:
If you have any questions about the release process, please ask in the #jetpack-releases channel on Slack. Wpcomsh plugin:
If you have any questions about the release process, please ask in the #jetpack-releases channel on Slack. Automattic For agencies client plugin:
If you have any questions about the release process, please ask in the #jetpack-releases channel on Slack. |
My first Jetpack PR, go easy! |
Needs a trunk merge now. |
I'm struggling to get this branch updated. I expected a basic fetch -> merge -> commit -> push, but local commit phpcs checks run out of memory, and several lock files show as needing an update and it's not clear how these should be done. |
Looking at the message from the "Lock files are up to date" check, it seems you committed the merge conflict markers to the files instead of resolving the conflicts, e.g. jetpack/projects/plugins/automattic-for-agencies-client/composer.lock Lines 865 to 869 in 2764fbb
The doc at docs/git-workflow.md#dealing-with-lock-files has some tips on how to most easily resolve merge conflicts in lock files. TL;DR: reset them to the trunk versions then run tools/composer-update-monorepo.sh on each one's containing directory.
I don't know what to tell you about phpcs running out of memory when run locally, other than to check that you don't have an unnecessarily low |
Thanks for the tips! I'll try with these and see if I can get it to update properly. |
This PR has been marked as stale. This happened because:
If this PR is still useful, please do a [trunk merge or rebase](https://github.com/Automattic/jetpack/blob/trunk/docs/git-workflow.md#keeping-your-branch-up-to-date) and otherwise make sure it's up to date and has clear testing instructions. You may also want to ping possible reviewers in case they've forgotten about it. Please close this PR if you think it's not valid anymore — if you do, please add a brief explanation. If the PR is not updated (or at least commented on) in another month, it will be automatically closed. |
Proposed changes:
Other information:
Jetpack product discussion
https://github.com/a8cteam51/a8c-support-theme/issues/27
Does this pull request change what data or activity we track or use?
No.
Testing instructions:
I'm not completely sure how to test this change, but ideally:
kb_articles
CPT, including the filter options in the widget.kb_category
andkb_tag
taxonomies.